Auto merge of #2324 - rillian:fixes, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 28 Jan 2016 22:05:50 +0000 (22:05 +0000)
committerbors <bors@rust-lang.org>
Thu, 28 Jan 2016 22:05:50 +0000 (22:05 +0000)

Trivial merge